Skip to content

Remove unneeded if statements for update repo API #35140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 11 commits into from
Aug 5, 2025
Merged

Remove unneeded if statements for update repo API #35140

merged 11 commits into from
Aug 5, 2025

Conversation

6543
Copy link
Member

@6543 6543 commented Jul 21, 2025

just try to make the update func more redable and be more KISS

Sponsored by Kithara Software GmbH

@6543 6543 added type/refactoring Existing code has been cleaned up. There should be no new functionality. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jul 21, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 21, 2025
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code labels Jul 21, 2025
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 21, 2025
@delvh delvh changed the title Refactor: make if statements more redable and have less checks as not needed Refactor: Remove unneeded if statements Jul 21, 2025
@delvh delvh changed the title Refactor: Remove unneeded if statements Remove unneeded if statements for update repo API Jul 21, 2025
@6543
Copy link
Member Author

6543 commented Jul 21, 2025

TestAPIRepoEdit fails but i dont know why jet

@lunny
Copy link
Member

lunny commented Jul 21, 2025

It's related. The logic is different from previous implementation. All UnitEnabled missed.

@6543
Copy link
Member Author

6543 commented Jul 21, 2025

of course it was related ... see fix

and the check if unit exists is not needed and was already missing in some unit update codeblocks ...

@6543
Copy link
Member Author

6543 commented Jul 21, 2025

  • in case a unit does not exist and is going to be marked as deleted -> db query will just ignore it as there is no match
  • in case a unit does exist and is going to be marked as deleted -> db query will match and delete it
  • in case a unit dose exist and the option defines a new one, before the new values are set the unit gets deteted and recreated with the new settings -> no check needed if it exist because it will be deleted before if so
  • in case a unit dose not exist and the option defines a new one, it gets created with the new settings -> no check needed

@6543
Copy link
Member Author

6543 commented Jul 21, 2025

was an logic issue ... where two excluse unit tyes exist and there globalEnabled check was if-else-if chained ...

@6543 6543 requested a review from lunny July 21, 2025 20:38
@lunny
Copy link
Member

lunny commented Jul 23, 2025

was an logic issue ... where two excluse unit tyes exist and there globalEnabled check was if-else-if chained ...

The logic changed.
Before

(opts.HasIssues == nil && currHasIssues == true) || (opts.HasIssues != nil && *opts.HasIssues)

After

(opts.HasIssues != nil && *opts.HasIssues)

@6543
Copy link
Member Author

6543 commented Jul 24, 2025

@lunny thats not true ... its:

(opts.HasIssues != nil && *opts.HasIssues && externalEnabled) or
(opts.HasIssues != nil && *opts.HasIssues && internalEnabled) or
(opts.HasIssues != nil && !*opts.HasIssues)

@GiteaBot GiteaBot removed the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Aug 4, 2025
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Aug 4, 2025
@lunny lunny added this to the 1.25.0 milestone Aug 4, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 4, 2025
@6543 6543 enabled auto-merge (squash) August 5, 2025 01:15
@6543 6543 mentioned this pull request Aug 5, 2025
Merged
@6543 6543 merged commit de570b7 into go-gitea:main Aug 5, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 5, 2025
@lunny lunny deleted the refactor_api-repo-unit-update branch August 5, 2025 03:19
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 5, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
64acf61 
* giteaofficial/main:
  Fix Actions API (go-gitea#35204)
  Add webhook test for push event (go-gitea#34442)
  Remove unneeded if statements for `update repo` API  (go-gitea#35140)
  [skip ci] Updated translations via Crowdin
  Step down as maintainer (justusbunsi) (go-gitea#35212)
  Display pull request in merged commit view (go-gitea#35202)
  Step down as maintainer (pat-s) (go-gitea#35213)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.
4 participants
@6543 @lunny @delvh @GiteaBot